Issue #294 fix