IssueID #24 Fixed