Fixed save bug