+ Fixed bug in solving collisions