Corrected save button issue further