fix overlapping