Fix validate_on_save decorator