fixed potential erroneous collision cases