Issue #135 fixed, pending verification