Fixed speed gathering again

As the title states #271