Issue #15 fix