Fixed intersection issues