diff --git a/gpAux/gpdemo/demo_cluster.sh b/gpAux/gpdemo/demo_cluster.sh
index d7b411fe771d31ec768675b6995c40532c600257..0163dec1a383bff22718da999f8da34a4e1559f6 100755
--- a/gpAux/gpdemo/demo_cluster.sh
+++ b/gpAux/gpdemo/demo_cluster.sh
@@ -162,8 +162,6 @@ if [ -z "${GPHOME}" ]; then
     echo "  file in your Greenplum installation directory."
     echo ""
     exit 1
-else
-    GPSEARCH=$GPHOME
 fi
 
 cat <<-EOF
@@ -194,16 +192,16 @@ cat <<-EOF
 
 EOF
 
-GPPATH=`find $GPSEARCH -name gp_dump| tail -1`
+GPPATH=`find -H $GPHOME -name gp_dump| tail -1`
 RETVAL=$?
 
 if [ "$RETVAL" -ne 0 ]; then
-    echo "Error attempting to find Greenplum executables in $GPSEARCH"
+    echo "Error attempting to find Greenplum executables in $GPHOME"
     exit 1
 fi
 
 if [ ! -x "$GPPATH" ]; then
-    echo "No executables found for Greenplum installation in $GPSEARCH"
+    echo "No executables found for Greenplum installation in $GPHOME"
     exit 1
 fi
 GPPATH=`dirname $GPPATH`