bugfix
overlap bugfix