Fix issue-8-0