Correction in rotation handling