Close #7 issue.