Fixes save problems