fix overlap