Issue #84 fixed, pending verification