Fixed data consistency on rotation