issue-24-6