Fix 'save_if_changed' (add sort)