FIX #1 Remove unnecessary save condition