diff --git a/Binance.Net/Binance.Net.csproj b/Binance.Net/Binance.Net.csproj
index 637fc11f..d2b684f0 100644
--- a/Binance.Net/Binance.Net.csproj
+++ b/Binance.Net/Binance.Net.csproj
@@ -48,7 +48,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Binance.Net/Objects/Models/BinanceOrderBase.cs b/Binance.Net/Objects/Models/BinanceOrderBase.cs
index fc1d89a3..9275710e 100644
--- a/Binance.Net/Objects/Models/BinanceOrderBase.cs
+++ b/Binance.Net/Objects/Models/BinanceOrderBase.cs
@@ -29,7 +29,7 @@ public record BinanceOrderBase
/// Original order id
///
[JsonPropertyName("origClientOrderId")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string OriginalClientOrderId { get; set; } = string.Empty;
@@ -38,7 +38,7 @@ public record BinanceOrderBase
/// The order id as assigned by the client
///
[JsonPropertyName("clientOrderId")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string ClientOrderId { get; set; } = string.Empty;
diff --git a/Binance.Net/Objects/Models/Futures/AlgoOrders/BinanceAlgoOrder.cs b/Binance.Net/Objects/Models/Futures/AlgoOrders/BinanceAlgoOrder.cs
index 65882ffb..95f717a8 100644
--- a/Binance.Net/Objects/Models/Futures/AlgoOrders/BinanceAlgoOrder.cs
+++ b/Binance.Net/Objects/Models/Futures/AlgoOrders/BinanceAlgoOrder.cs
@@ -70,7 +70,7 @@ public record BinanceAlgoOrder
/// Client algo id
///
[JsonPropertyName("clientAlgoId")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string ClientAlgoId { get; set; } = string.Empty;
diff --git a/Binance.Net/Objects/Models/Futures/AlgoOrders/BinanceAlgoOrderResult.cs b/Binance.Net/Objects/Models/Futures/AlgoOrders/BinanceAlgoOrderResult.cs
index 17a7efb9..2f52218d 100644
--- a/Binance.Net/Objects/Models/Futures/AlgoOrders/BinanceAlgoOrderResult.cs
+++ b/Binance.Net/Objects/Models/Futures/AlgoOrders/BinanceAlgoOrderResult.cs
@@ -9,7 +9,7 @@ public record BinanceAlgoOrderResult: BinanceResult
/// Order id
///
[JsonPropertyName("clientAlgoId")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string ClientAlgoId { get; set; } = string.Empty;
diff --git a/Binance.Net/Objects/Models/Futures/BinanceFuturesOrder.cs b/Binance.Net/Objects/Models/Futures/BinanceFuturesOrder.cs
index 45af62b4..146a5e39 100644
--- a/Binance.Net/Objects/Models/Futures/BinanceFuturesOrder.cs
+++ b/Binance.Net/Objects/Models/Futures/BinanceFuturesOrder.cs
@@ -29,7 +29,7 @@ public record BinanceFuturesOrder
/// The order id as assigned by the client
///
[JsonPropertyName("clientOrderId")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string ClientOrderId { get; set; } = string.Empty;
diff --git a/Binance.Net/Objects/Models/Futures/BinanceFuturesOrderEditHistory.cs b/Binance.Net/Objects/Models/Futures/BinanceFuturesOrderEditHistory.cs
index 1c27ab92..d4fd8da5 100644
--- a/Binance.Net/Objects/Models/Futures/BinanceFuturesOrderEditHistory.cs
+++ b/Binance.Net/Objects/Models/Futures/BinanceFuturesOrderEditHistory.cs
@@ -33,7 +33,7 @@ public record BinanceFuturesOrderEditHistory
/// The order id as assigned by the client
///
[JsonPropertyName("clientOrderId")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string? ClientOrderId { get; set; }
diff --git a/Binance.Net/Objects/Models/Futures/Socket/BinanceFuturesStreamOrderUpdate.cs b/Binance.Net/Objects/Models/Futures/Socket/BinanceFuturesStreamOrderUpdate.cs
index fffdd79a..9f6247eb 100644
--- a/Binance.Net/Objects/Models/Futures/Socket/BinanceFuturesStreamOrderUpdate.cs
+++ b/Binance.Net/Objects/Models/Futures/Socket/BinanceFuturesStreamOrderUpdate.cs
@@ -39,7 +39,7 @@ public record BinanceFuturesStreamOrderUpdateData
/// The new client order id
///
[JsonPropertyName("c")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string ClientOrderId { get; set; } = string.Empty;
diff --git a/Binance.Net/Objects/Models/Futures/Socket/BinanceFuturesStreamTradeUpdate.cs b/Binance.Net/Objects/Models/Futures/Socket/BinanceFuturesStreamTradeUpdate.cs
index 1218287c..256a4a0b 100644
--- a/Binance.Net/Objects/Models/Futures/Socket/BinanceFuturesStreamTradeUpdate.cs
+++ b/Binance.Net/Objects/Models/Futures/Socket/BinanceFuturesStreamTradeUpdate.cs
@@ -42,7 +42,7 @@ public record BinanceFuturesStreamTradeUpdate : BinanceStreamEvent
/// "settlement_autoclose-": settlement order for delisting or delivery
///
[JsonPropertyName("c")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string ClientOrderId { get; set; } = string.Empty;
diff --git a/Binance.Net/Objects/Models/Spot/BinanceOrderOcoList.cs b/Binance.Net/Objects/Models/Spot/BinanceOrderOcoList.cs
index 11c6f3d9..84e52ca2 100644
--- a/Binance.Net/Objects/Models/Spot/BinanceOrderOcoList.cs
+++ b/Binance.Net/Objects/Models/Spot/BinanceOrderOcoList.cs
@@ -32,7 +32,7 @@ public record BinanceOrderOcoList
/// The client id of the order list
///
[JsonPropertyName("listClientOrderId")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string ListClientOrderId { get; set; } = string.Empty;
@@ -78,7 +78,7 @@ public record BinanceOrderId
/// The client order id
///
[JsonPropertyName("clientOrderId")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string ClientOrderId { get; set; } = string.Empty;
diff --git a/Binance.Net/Objects/Models/Spot/Socket/BinanceStreamOrderList.cs b/Binance.Net/Objects/Models/Spot/Socket/BinanceStreamOrderList.cs
index 100143a2..12f92a2d 100644
--- a/Binance.Net/Objects/Models/Spot/Socket/BinanceStreamOrderList.cs
+++ b/Binance.Net/Objects/Models/Spot/Socket/BinanceStreamOrderList.cs
@@ -37,7 +37,7 @@ public record BinanceStreamOrderList: BinanceStreamEvent
/// The client id of the order list
///
[JsonPropertyName("C")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string ListClientOrderId { get; set; } = string.Empty;
@@ -82,7 +82,7 @@ public record BinanceStreamOrderId
/// The client order id
///
[JsonPropertyName("c")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string ClientOrderId { get; set; } = string.Empty;
diff --git a/Binance.Net/Objects/Models/Spot/Socket/BinanceStreamOrderUpdate.cs b/Binance.Net/Objects/Models/Spot/Socket/BinanceStreamOrderUpdate.cs
index 53602679..d1d1103d 100644
--- a/Binance.Net/Objects/Models/Spot/Socket/BinanceStreamOrderUpdate.cs
+++ b/Binance.Net/Objects/Models/Spot/Socket/BinanceStreamOrderUpdate.cs
@@ -22,7 +22,7 @@ public record BinanceStreamOrderUpdate: BinanceStreamEvent
/// The new client order id
///
[JsonPropertyName("c")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string ClientOrderId { get; set; } = string.Empty;
@@ -75,7 +75,7 @@ public record BinanceStreamOrderUpdate: BinanceStreamEvent
/// The original client order id
///
[JsonPropertyName("C")]
- [JsonConverterCtor(
+ [JsonConverterCtor(typeof(ReplaceConverter),
$"{BinanceExchange.ClientOrderIdPrefixSpot}->",
$"{BinanceExchange.ClientOrderIdPrefixFutures}->")]
public string? OriginalClientOrderId { get; set; } = string.Empty;