Close #1 issue.