Fix Rotation flaws