Better collision checking