diff --git a/tools/install_pip.sh b/tools/install_pip.sh
index d3f5e78..017e716 100755
--- a/tools/install_pip.sh
+++ b/tools/install_pip.sh
@@ -25,6 +25,7 @@
 FILES=$TOP_DIR/files
 
 PIP_GET_PIP_URL=https://bootstrap.pypa.io/get-pip.py
+LOCAL_PIP="$FILES/$(basename $PIP_GET_PIP_URL)"
 
 GetDistro
 echo "Distro: $DISTRO"
@@ -41,12 +42,11 @@
 
 
 function install_get_pip {
-    if [[ ! -r $FILES/get-pip.py ]]; then
-        (cd $FILES; \
-            curl -O $PIP_GET_PIP_URL; \
-        )
+    if [[ ! -r $LOCAL_PIP ]]; then
+        curl -o $LOCAL_PIP $PIP_GET_PIP_URL || \
+            die $LINENO "Download of get-pip.py failed"
     fi
-    sudo -E python $FILES/get-pip.py
+    sudo -E python $LOCAL_PIP
 }