Swarm fix