Fix for Save button madness