fixed the collision issue