bugfix overlap