#40 fix (save after press OK button)