Fix finishing early