Add a check for isUpdating