Finally fixed overlap.