Issue #79 fix