Fixed rotation issue