Fixed issue with saving items