Fix overlapping issue