Should fix tag group race condition.