Close #2 issue.