Fix overlap