Fix for #560 - Move debug bar from finish, to after