Fixed collision problems... for real, this time

As it turns out, a far simpler method was also the one that solved my
problem.