Issue #17 fix