Make it stop properly