Dennis' part fixed
issueId #11