Fix a race condition in supported groups handling