ISSUE #1681

ISSUE #1781