Fixing save organization function.