diff --git a/setup.sh b/setup.sh
index 885b32173d70998af97444b4b8eecfce696e0efb..8c6209fb317a018bc5c581265269a68628f9e035 100755
--- a/setup.sh
+++ b/setup.sh
@@ -188,7 +188,11 @@ function waGetSourceCode() {
 function waGetInquirer() {
     local INQUIRER=$INQUIRER_PATH
 
-    if [ ! -d "$SYS_SOURCE_PATH" ] && [ ! -d "$USER_SOURCE_PATH" ]; then
+    if [ -d "$SYS_SOURCE_PATH" ]; then
+        INQUIRER=$SYS_SOURCE_PATH/$INQUIRER_PATH
+    elif [ -d "$USER_SOURCE_PATH" ] ; then
+        INQUIRER=$USER_SOURCE_PATH/$INQUIRER_PATH
+    else
         INQUIRER="/tmp/waInquirer.sh"
         rm -f "$INQUIRER"