Issue #1011 fix