diff --git a/pshell b/pshell
index 436579a..ecd93d0 100755
--- a/pshell
+++ b/pshell
@@ -76,6 +76,11 @@ done
 
 export JVM_EARGS=
 
+#If starting with -cp the options in PShell manifest fle are not executed: must be don by command line
+if [[ $JAVA_VER != *"1.8.0"* ]]; then
+    #echo 'Java > 1.8'
+    export JVM_EARGS="--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.base/jdk.internal.loader=ALL-UNNAMED"
+fi
 
 #Standard startup
 if [[ $@ != **-py** ]] ; then
@@ -127,12 +132,6 @@ else
 	export JEP_JAR=${PYTHONHOME}/lib/python2.7/site-packages/jep/jep-3.5.3.jar
 fi
 
-#If starting with -cp the options in PShell manifest fle are not executed: must be don by command line
-if [[ $JAVA_VER != *"1.8.0"* ]]; then
-    #echo 'Java > 1.8'
-    export JVM_EARGS="--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED --add-opens java.base/jdk.internal.loader=ALL-UNNAMED"
-fi
-
 export PATH=${PYTHONHOME}/bin:$CLEAN_PATH
 ${JAVA_VER}/bin/java  ${JVM_EARGS} ${JVM_ARGS} -cp /opt/gfa/pshell/${PSHELL_VER}:${JEP_JAR} ch.psi.pshell.ui.App $@