ISSUE-23 solutions