issue-2047