Close #3 issue.