Fixed dandelion/issues#41