Tring to fix overlap