quick fix on collision