IssueID #25 Fixed