Issue #108 fixed, pending verification