Issue #2 fix