Fixed rotating issue