Fix Issue #73