fixed saving conditions