Close #9 issue.