Fix overlap with diff