Issue #3 fix