Fixed #29 issue.