Really fixed dandelion/issues#67 ...