Fixed type mapping issue.