ISSUE-13 solutions