resolving the issue-26

Fixing the issues-26.