save button bug fix