Fixed rotation issues due to unsaved state