Issue #73 is fixed