diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml
index d06dac29..995a0f1a 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml
@@ -32,7 +32,7 @@
                     @foreach (var item in Model.Items)
                     {
                         string imageName = item.ImageName.IsNullOrEmpty() ? "/product-images/noimage.jpg" : $"/product-images/{item.ImageName}";
-                        var price = (item.TotalPrice * item.Count).ToString("0.00");
+                        var price = item.TotalPrice.ToString("0.00");
                         <div class="card basket-list-item" data-product-id="@item.ProductId">
                             <div class="card-body">
                                 <div class="flex-container horizontal">
@@ -48,7 +48,9 @@
                                                 <span>$@price</span>
                                             </div>
                                             <div class="flex-item description-cargo">
-                                                <span><i class="fa fa-truck"></i> @L["FreeCargo"]</span>
+                                                <span>
+                                                    <i class="fa fa-truck"></i> @L["FreeCargo"]
+                                                </span>
                                             </div>
                                         </div>
                                     </div>
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicAutoMapperProfile.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicAutoMapperProfile.cs
index 6d5f87e8..b315177c 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicAutoMapperProfile.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicAutoMapperProfile.cs
@@ -18,10 +18,10 @@ namespace EShopOnAbp.PublicWeb
                 .ForMember(p => p.Quantity, opts => opts.MapFrom(p => p.Count));
 
             CreateMap<BasketItemDto, OrderItemCreateDto>()
-                .ForMember(p => p.UnitPrice, opts => opts.MapFrom(q => q.TotalPrice))
+                .ForMember(p => p.UnitPrice, opts => opts.MapFrom(q => q.TotalPrice / q.Count))
                 .ForMember(p => p.Units, opts => opts.MapFrom(q => q.Count))
                 .ForMember(p => p.PictureUrl, opts => opts.MapFrom(q => q.ImageName))
                 .Ignore(q => q.Discount);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/OrderReceived.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/OrderReceived.cshtml
index 94c08676..b9c9d777 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/OrderReceived.cshtml
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/OrderReceived.cshtml
@@ -2,8 +2,7 @@
 @using System.Globalization
 @model EShopOnAbp.PublicWeb.Pages.OrderReceivedModel
 @{
-    decimal orderTotal = 0;
-    Model.ReceivedOrder.Items.ForEach(q => orderTotal += q.Units * q.UnitPrice);
+    decimal orderTotal = Model.ReceivedOrder.Items.Sum(q => q.UnitPrice * q.Units);
     string orderTotalString = orderTotal.ToString("C", new CultureInfo("en-US")); // We work with USD any ways
     string orderNoString = Model.ReceivedOrder.OrderNo.ToString("N0", new NumberFormatInfo() {NumberGroupSeparator = " "});
 }