Issue #139 fix