Fixed #23 issue.