Issue #1104 fix