Work on fix for #108 in mainline