Fixing dandelion issue