Fixed dublicate-collision-detect and enhanced coll-detect algo