diff --git a/src/main/java/com/cleanengine/coin/order/adapter/in/event/SpringOrderCreatedAddQueueHandler.java b/src/main/java/com/cleanengine/coin/order/adapter/in/event/SpringOrderCreatedAddQueueHandler.java
index 4af03dbb..04c314da 100644
--- a/src/main/java/com/cleanengine/coin/order/adapter/in/event/SpringOrderCreatedAddQueueHandler.java
+++ b/src/main/java/com/cleanengine/coin/order/adapter/in/event/SpringOrderCreatedAddQueueHandler.java
@@ -16,7 +16,7 @@ public class SpringOrderCreatedAddQueueHandler {
     private final WaitingOrdersManager waitingOrdersManager;
     private final ApplicationEventPublisher applicationEventPublisher;
 
-    @TransactionalEventListener(OrderCreated.class)
+    @TransactionalEventListener
     public void handleOrderCreated(OrderCreated event) {
         Order order = event.order();
         WaitingOrders waitingOrders = waitingOrdersManager.getWaitingOrders(order.getTicker());
diff --git a/src/main/java/com/cleanengine/coin/order/adapter/in/event/SpringOrderCreatedUpdateOrderBookHandler.java b/src/main/java/com/cleanengine/coin/order/adapter/in/event/SpringOrderCreatedUpdateOrderBookHandler.java
index ba4572e9..aef0fbd9 100644
--- a/src/main/java/com/cleanengine/coin/order/adapter/in/event/SpringOrderCreatedUpdateOrderBookHandler.java
+++ b/src/main/java/com/cleanengine/coin/order/adapter/in/event/SpringOrderCreatedUpdateOrderBookHandler.java
@@ -11,7 +11,7 @@
 public class SpringOrderCreatedUpdateOrderBookHandler {
     private final UpdateOrderBookUsecase updateOrderBookUsecase;
 
-    @TransactionalEventListener(OrderCreated.class)
+    @TransactionalEventListener
     public void handleOrderCreated(OrderCreated event) {
         updateOrderBookUsecase.updateOrderBookOnNewOrder(event.order());
     }
diff --git a/src/main/java/com/cleanengine/coin/orderbook/application/service/OrderBookService.java b/src/main/java/com/cleanengine/coin/orderbook/application/service/OrderBookService.java
index 8d5358d3..3360b9e9 100644
--- a/src/main/java/com/cleanengine/coin/orderbook/application/service/OrderBookService.java
+++ b/src/main/java/com/cleanengine/coin/orderbook/application/service/OrderBookService.java
@@ -30,7 +30,7 @@ public void updateOrderBookOnNewOrder(Order order) {
         activeOrders(ticker).saveOrder(order);
 
         boolean isBuyOrder = order instanceof BuyOrder;
-        orderBookDomainService.updateOrderBookOnNewOrder(ticker, isBuyOrder, order.getPrice(), order.getOrderSize());
+        orderBookDomainService.updateOrderBookOnNewOrder(ticker, isBuyOrder, order.getPrice(), order.getRemainingSize());
 
         sendOrderBookUpdated(ticker);
     }