Fix broken collision code
Merge commit '3d7dd8c65274b08a7beceb56eda364dc34d7bcf8' of https://github.com/mboeh/starfish into 0.11