Issue #52 fixed, pending verification