Fixed crash due to dandelion