Fixed critical save bug