Overlapping fix