Solved issue-618

Fixed #618