Fixed issue with double-saving'