attempt to fix the overlapping issues