diff --git a/src/main/java/org/gcube/smartgears/provider/DefaultProvider.java b/src/main/java/org/gcube/smartgears/provider/DefaultProvider.java
index ac16d7b..1308cc8 100644
--- a/src/main/java/org/gcube/smartgears/provider/DefaultProvider.java
+++ b/src/main/java/org/gcube/smartgears/provider/DefaultProvider.java
@@ -147,14 +147,14 @@ public class DefaultProvider implements Provider {
 
 			// searching for smartegars related application handlers in the common
 			// classloader
-			//ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
-			/*if (currentClassLoader.getParent() != null
+			ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
+			if (currentClassLoader.getParent() != null
 					&& !currentClassLoader.getParent().equals(ClassLoader.getSystemClassLoader())) {
 				log.trace("probably i'm in a webapp classloader");
 				currentClassLoader = currentClassLoader.getParent();
-			}*/
+			}
 
-			ApplicationHandlers defaultHandlers = binder.bindHandlers(ClassLoader.getPlatformClassLoader());
+			ApplicationHandlers defaultHandlers = binder.bindHandlers(currentClassLoader);
 
 			return defaultHandlers;