Fixed dandelion/issues#30