Fix #16 issue.