Fixed special case collision logic