Saving bugfix