Fix for rotation issues