diff --git a/src/main/java/org/warp/commonutils/concurrency/executor/BoundedExecutorServiceImpl.java b/src/main/java/org/warp/commonutils/concurrency/executor/BoundedExecutorServiceImpl.java
index ba5447c..4c37cd1 100644
--- a/src/main/java/org/warp/commonutils/concurrency/executor/BoundedExecutorServiceImpl.java
+++ b/src/main/java/org/warp/commonutils/concurrency/executor/BoundedExecutorServiceImpl.java
@@ -1,9 +1,14 @@
 package org.warp.commonutils.concurrency.executor;
 
-import org.jetbrains.annotations.Nullable;
-
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
+import org.jetbrains.annotations.Nullable;
 
 class BoundedExecutorServiceImpl extends ThreadPoolExecutor implements BoundedExecutorService {
 
@@ -43,8 +48,7 @@ class BoundedExecutorServiceImpl extends ThreadPoolExecutor implements BoundedEx
 	 */
 	@Override
 	public <T> Future<T> submitButBlockIfFull(final Callable<T> task) throws InterruptedException {
-		blockIfFull();
-		return submit(task);
+		return super.submit(task);
 	}
 
 	/**
@@ -53,8 +57,7 @@ class BoundedExecutorServiceImpl extends ThreadPoolExecutor implements BoundedEx
 	 */
 	@Override
 	public void executeButBlockIfFull(final Runnable task) throws InterruptedException {
-		blockIfFull();
-		execute(task);
+		super.execute(task);
 	}
 
 	private void blockIfFull() throws InterruptedException {
@@ -68,6 +71,12 @@ class BoundedExecutorServiceImpl extends ThreadPoolExecutor implements BoundedEx
 
 	@Override
 	public void beforeExecute(Thread t, Runnable r) {
+		try {
+			blockIfFull();
+		} catch (InterruptedException e) {
+			throw new RuntimeException(e);
+		}
+
 		var queueSize = getQueue().size();
 		synchronized (queueSizeStatusLock) {
 			if (queueSizeStatus != null) queueSizeStatus.accept(queueSize >= maxQueueSize, queueSize);