diff --git a/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesCompletionProposalProvider.java b/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesCompletionProposalProvider.java
index 305217110bf9769b96f3b80113a424c6e5033023..fe32ba2c044ccda3b492ff520f5e66bd880e023f 100644
--- a/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesCompletionProposalProvider.java
+++ b/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesCompletionProposalProvider.java
@@ -55,13 +55,13 @@ public class VariablesCompletionProposalProvider implements IJavaCompletionPropo
     public List<ICompletionProposal> computeCompletionProposals(final ContentAssistInvocationContext context, final IProgressMonitor monitor) {
         final List<ICompletionProposal> list = new ArrayList<ICompletionProposal>();
         if (context instanceof JavaContentAssistInvocationContext) {
+            final ITextViewer viewer = context.getViewer();
+            final List<ScriptVariable> variables = getScriptVariables(viewer);
+            if (variables.isEmpty()) {
+                return list;
+            }
             final ICompilationUnit unit = ((JavaContentAssistInvocationContext) context).getCompilationUnit();
             if (unit instanceof GroovyCompilationUnit) {
-                final ITextViewer viewer = context.getViewer();
-                final List<ScriptVariable> variables = getScriptVariables(viewer);
-                if (variables.isEmpty()) {
-                    return list;
-                }
                 if (((GroovyCompilationUnit) unit).getModuleNode() == null) {
                     return Collections.emptyList();
                 }
diff --git a/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesTypeCompletionProposal.java b/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesTypeCompletionProposal.java
index 86cfbdb8c1417985fc9fd231588b3f18e3deeae0..423c3fe2a68ccb5a7680b306307317b998874b3b 100644
--- a/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesTypeCompletionProposal.java
+++ b/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesTypeCompletionProposal.java
@@ -35,7 +35,6 @@ import org.codehaus.groovy.eclipse.codeassist.requestor.ContentAssistContext;
 import org.codehaus.groovy.eclipse.codeassist.requestor.GroovyCompletionProposalComputer;
 import org.codehaus.jdt.groovy.model.GroovyCompilationUnit;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.CompletionContext;
 import org.eclipse.jdt.core.CompletionProposal;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaProject;
@@ -43,8 +42,6 @@ import org.eclipse.jdt.core.IMethod;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.groovy.core.util.ReflectionUtils;
-import org.eclipse.jdt.internal.codeassist.InternalCompletionContext;
 import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
 import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer;
 import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;
@@ -70,18 +67,20 @@ public class VariablesTypeCompletionProposal implements IJavaCompletionProposalC
     public List<ICompletionProposal> computeCompletionProposals(final ContentAssistInvocationContext context, final IProgressMonitor monitor) {
         final List<ICompletionProposal> list = new ArrayList<ICompletionProposal>();
         if (context instanceof JavaContentAssistInvocationContext) {
-            final CompletionContext coreContext = ((JavaContentAssistInvocationContext) context).getCoreContext();
-            if (coreContext != null && !coreContext.isExtended()) {
-                // must use reflection to set the fields
-                ReflectionUtils.setPrivateField(InternalCompletionContext.class, "isExtended", coreContext, true);
+            final ITextViewer viewer = context.getViewer();
+            final List<ScriptVariable> scriptVariables = getScriptVariables(viewer);
+            if (scriptVariables.isEmpty()) {
+                return list;
             }
+            //            final CompletionContext coreContext = ((JavaContentAssistInvocationContext) context).getCoreContext();
+            //            if (coreContext != null && !coreContext.isExtended()) {
+            //                // must use reflection to set the fields
+            //                ReflectionUtils.setPrivateField(InternalCompletionContext.class, "isExtended", coreContext, true);
+            //                ReflectionUtils.setPrivateField(InternalCompletionContext.class, "extendedContext", coreContext,
+            //                        new GroovyExtendedCompletionContext(getContext(), requestor.currentScope));
+            //            }
             final ICompilationUnit unit = ((JavaContentAssistInvocationContext) context).getCompilationUnit();
             if (unit instanceof GroovyCompilationUnit) {
-                final ITextViewer viewer = context.getViewer();
-                final List<ScriptVariable> scriptVariables = getScriptVariables(viewer);
-                if (scriptVariables.isEmpty()) {
-                    return list;
-                }
                 if (((GroovyCompilationUnit) unit).getModuleNode() == null) {
                     return Collections.emptyList();
                 }