Issue #117 fixed, pending verification