Issue #119 fixed, pending verification