Fixing save operation