Optimizing save fix.