some fix in rotation