Save button bug fixed