Fixed #31 issue.