Fixing save bug