Fixed issues with rotating