2.1.7.1: Hopefully fixed swarm OOS