Fixing rotation issues