Fixed dandelion/issues#86