more fix on collision