Fixed ISSUE-07