Fixed #1 issue.