ISSUE-26 Solutions