Apply fix for Type mismatch COM Exception