Properly handle year on rotation