Issue #13 fix