Issue #1 fix