Fix overlap problems