fix possible overlapping