Trying to fix annoying collision problems.