Fixed racing condition with TornadoOctopus