Solved issue-618 updated for coding style