Issue #74 fix