Partially fixed collisions
Fixed another bug with collisions