Linked with dandelion/issues#49
Fixed dandelion/issues#85