Bugfix saving