Issue #31 fix