Issue #65 fix