Fix cannot save issue