Yet another save fix