bugfix and smooth overlap