Fixed dandelion/issues#28