Fixed #8 issue.