Crash when saved twice. #1

Fix issue #1