Fixed forceSave feature