Fixed rotation issues