diff --git a/src/main/java/org/gcube/smartgears/Bootstrap.java b/src/main/java/org/gcube/smartgears/Bootstrap.java
index f1fa17f..9f107a6 100644
--- a/src/main/java/org/gcube/smartgears/Bootstrap.java
+++ b/src/main/java/org/gcube/smartgears/Bootstrap.java
@@ -141,7 +141,7 @@ public class Bootstrap implements ServletContainerInitializer {
 		try {
 
 			// TODO Ask why is needed?
-			Thread.currentThread().setContextClassLoader(ContainerManager.class.getClassLoader());
+			//Thread.currentThread().setContextClassLoader(ContainerManager.class.getClassLoader());
 
 			manager = ContainerManager.instance;
 
diff --git a/src/main/java/org/gcube/smartgears/provider/DefaultProvider.java b/src/main/java/org/gcube/smartgears/provider/DefaultProvider.java
index 1308cc8..ac16d7b 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(currentClassLoader);
+			ApplicationHandlers defaultHandlers = binder.bindHandlers(ClassLoader.getPlatformClassLoader());
 
 			return defaultHandlers;