Fixed an issue with the save helper