Fixed collision highlight issue