issue-1392

issue-1392