Fixed dandelion/issues#16