Issue #10 fix