Close #4 issue.