Fixed to run all the way through