Possible fix for oddities when things save