Issue #8 fix