Close #5 issue.