Fix save button bug