Fix issue-1786