Fixed #63 issue.