Fixed double saving issue #4