Fixed #30 issue.