prevent overlapping

Change-Id: Ibd8a4bccf520c6069d894b5676148721c18ccdad