ISSUE-21 solutions