fix overlap bug