YBI-issue-17