Fixing pre_save reset (Optimized)