Quick solution for https://github.com/dandelion/dandelion/issues/32