Issue #72 fixed, pending verification