diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/DataLayer/ProductToAuctionDbTable.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/DataLayer/ProductToAuctionDbTable.cs
index 2355dad..b4c2724 100644
--- a/Nop.Plugin.Misc.AuctionPlugin/Domains/DataLayer/ProductToAuctionDbTable.cs
+++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/DataLayer/ProductToAuctionDbTable.cs
@@ -14,9 +14,10 @@ public class ProductToAuctionDbTable : MgDbTableBase<ProductToAuctionMapping>
     {
     }
 
-    private bool HasActiveAuctionStatus(AuctionStatus auctionStatus)
+    private static bool HasActiveAuctionStatus(AuctionStatus auctionStatus)
     {
-        return auctionStatus.HasFlag(AuctionStatus.Active) || auctionStatus.HasFlag(AuctionStatus.FirstWarning) || auctionStatus.HasFlag(AuctionStatus.SecondWarning);
+        return auctionStatus == AuctionStatus.Active;
+        //return auctionStatus.HasFlag(AuctionStatus.Active) || auctionStatus.HasFlag(AuctionStatus.FirstWarning) || auctionStatus.HasFlag(AuctionStatus.SecondWarning);
     }
 
     public IQueryable<ProductToAuctionMapping> GetByAuctionAndProductId(int auctionId, int productId, bool activeProductOnly = false)
@@ -26,11 +27,11 @@ public class ProductToAuctionDbTable : MgDbTableBase<ProductToAuctionMapping>
 
     public IQueryable<ProductToAuctionMapping> GetByProductId(int productId, bool activeProductOnly = false)
     {
-        return Table.Where(x => x.ProductId == productId && (!activeProductOnly || HasActiveAuctionStatus(x.AuctionStatus)));
+        return Table.Where(x => x.ProductId == productId && (!activeProductOnly || x.AuctionStatus == AuctionStatus.Active/*HasActiveAuctionStatus(x.AuctionStatus)*/));
     }
 
     public IQueryable<ProductToAuctionMapping> GetProductToAuctionsByAuctionId(int auctionId, bool activeProductOnly = false)
     {
-        return Table.Where(x => x.AuctionId == auctionId && (!activeProductOnly || HasActiveAuctionStatus(x.AuctionStatus)));
+        return Table.Where(x => x.AuctionId == auctionId && (!activeProductOnly || x.AuctionStatus == AuctionStatus.Active/*HasActiveAuctionStatus(x.AuctionStatus)*/));
     }
 }
\ No newline at end of file