Fixed type mapping issue