Close #8 issue.