Bugfix #1: Saving same data