Fixed a collision issue