Fix first save bug