fixed collision detection
Closes #4