Fix for potentially broken randomising

Setting it to immediately shuffle teams may fail since build 241, this
should fix it.