Issue #14 fix