diff --git a/mca.sh b/mca.sh
index ed819a6..8421726 100755
--- a/mca.sh
+++ b/mca.sh
@@ -120,11 +120,11 @@ if [ "$CONFIGURE_ONLY" -eq 0 ]; then
         echo "$EXEC_NAME: $SCREEN_NAME: no such screen found" >&2
         exit 2
     fi
+fi
 
-    if [ ! -d "$MCA_DIR" ]; then
-        echo "$EXEC_NAME: $MCA_DIR: such directory not found" >&2
-        exit 2
-    fi
+if [ ! -d "$MCA_DIR" ]; then
+    echo "$EXEC_NAME: $MCA_DIR: such directory not found" >&2
+    exit 2
 fi
 
 cd "$MCA_DIR"
@@ -240,8 +240,8 @@ if [ "$CONFIGURE_ONLY" -eq 0 ]; then
             ;;
     esac
 
-    if [ -n "$MCA_OPT_JAVA_HOME" ] && [ -d "$MCA_OPT_JAVA_HOME/bin" ]; then
-        PATH="$MCA_OPT_JAVA_HOME/bin:$PATH"
+    if [ -n "$MCA_JAVA_HOME" ] && [ -d "$MCA_JAVA_HOME/bin" ]; then
+        PATH="$MCA_JAVA_HOME/bin:$PATH"
     fi
 
     if ! command -v java > /dev/null; then
@@ -249,10 +249,10 @@ if [ "$CONFIGURE_ONLY" -eq 0 ]; then
         exit 2
     fi
 
-    [ -n "$MCA_OPT_MAX_MEMORY" ] \
-        && MCA_JVM_FLAGS="-Xmx$MCA_OPT_MAX_MEMORY $MCA_JVM_FLAGS"
-    [ -n "$MCA_OPT_MIN_MEMORY" ] \
-        && MCA_JVM_FLAGS="-Xms$MCA_OPT_MIN_MEMORY $MCA_JVM_FLAGS"
+    [ -n "$MCA_MAX_MEMORY" ] \
+        && MCA_JVM_FLAGS="-Xmx$MCA_MAX_MEMORY $MCA_JVM_FLAGS"
+    [ -n "$MCA_MIN_MEMORY" ] \
+        && MCA_JVM_FLAGS="-Xms$MCA_MIN_MEMORY $MCA_JVM_FLAGS"
 
     SCREEN_CMD="$(which java) -server $MCA_JVM_FLAGS -jar $MCA_JAR"
 fi