issue-1058425 refactor