Fix 360 Degree Bug