Issue #16 fix