Fixed noclip stuttering described in #961