Linked with dandelion/issues#85