Add issue-7-2