Fixes IssueId #13