Fixed swinging for 2.5