fixed saving issue