Fix to save bug