Fixing a bug that breaks the handling of collisions.
Merge pull request #113 from JCook21/BugFix

Bug fix