NYCCHKBK-4273 fixed overlapping issue.