fix collision
Merge pull request #12 from adrianob/fix_collision

fix collision