Fixed a bug where sometimes collisions would get counted more than once. Should add a reg test for this.