Do the last thing the right way (thanks Mark)