diff --git a/commands b/commands
index 46e3633..c14615a 100755
--- a/commands
+++ b/commands
@@ -1,11 +1,18 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_PATH/common/functions"
+
+PLUGIN_BASE_PATH="$PLUGIN_PATH"
+if [[ -n $DOKKU_API_VERSION ]]; then
+  PLUGIN_BASE_PATH="$PLUGIN_ENABLED_PATH"
+fi
+source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$0")/functions"
 source "$(dirname "$0")/config"
 
-if [[ ! -d $PLUGIN_DATA_ROOT ]]; then
-  dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugins-install"
+if [[ $1 == $PLUGIN_COMMAND_PREFIX:* ]]; then
+  if [[ ! -d $PLUGIN_DATA_ROOT ]]; then
+    dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugin:install"
+  fi
 fi
 
 case "$1" in
diff --git a/docker-args b/docker-args
index ad986d6..e56b2c8 100755
--- a/docker-args
+++ b/docker-args
@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_PATH/common/functions"
+PLUGIN_BASE_PATH="$PLUGIN_PATH"
+if [[ -n $DOKKU_API_VERSION ]]; then
+  PLUGIN_BASE_PATH="$PLUGIN_ENABLED_PATH"
+fi
+source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$0")/functions"
 source "$(dirname "$0")/config"