Fix can not save issue