Save button fix