diff --git a/src/main/java/org/gcube/resources/discovery/icclient/Helper.java b/src/main/java/org/gcube/resources/discovery/icclient/Helper.java
index 2ba9474..2750d18 100644
--- a/src/main/java/org/gcube/resources/discovery/icclient/Helper.java
+++ b/src/main/java/org/gcube/resources/discovery/icclient/Helper.java
@@ -23,7 +23,7 @@ public class Helper {
 	public static String queryAddAuthenticationControl(String expression) throws MalformedQueryException
 	{
 		
-		String scope = SecretManagerProvider.instance.get().getContext();
+		String scope = SecretManagerProvider.get().getContext();
 		
 		if (scope==null || !new ContextBean(scope).is(Type.VRE))
 			return expression;
diff --git a/src/main/java/org/gcube/resources/discovery/icclient/ICClient.java b/src/main/java/org/gcube/resources/discovery/icclient/ICClient.java
index d153b3e..b30851b 100644
--- a/src/main/java/org/gcube/resources/discovery/icclient/ICClient.java
+++ b/src/main/java/org/gcube/resources/discovery/icclient/ICClient.java
@@ -37,7 +37,7 @@ public class ICClient implements DiscoveryClient<String> {
 	
 	
 	public List<String> submit(Query query) throws DiscoveryException {
-		Objects.requireNonNull(SecretManagerProvider.instance.get());
+		Objects.requireNonNull(SecretManagerProvider.get());
 		try {
 			CollectorStub stub = getStub();
 			String results = callService(query, stub);