Collision filtering  fixes #26