fixed the issues in pull request