fix overlap
fix overlap