Fix save issue