I think you should reset the velocity here, too.