diff --git a/requirements.txt b/requirements.txt
index 4a892a0d..93a3992d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 py4j
-pyspark
+pyspark==2.3.1
 sphinx
 tensorflow
diff --git a/tensorflowonspark/TFSparkNode.py b/tensorflowonspark/TFSparkNode.py
index 54488cce..50523f72 100644
--- a/tensorflowonspark/TFSparkNode.py
+++ b/tensorflowonspark/TFSparkNode.py
@@ -207,7 +207,9 @@ def _mapfn(iter):
       # search for tensorboard in python/bin, PATH, and PYTHONPATH
       pypath = sys.executable
       pydir = os.path.dirname(pypath)
-      search_path = os.pathsep.join([pydir, os.environ['PATH'], os.environ['PYTHONPATH']])
+      sys_path = os.pathsep.join(sys.path)
+      search_path = os.pathsep.join([pydir, sys_path, os.environ['PATH'], os.environ['PYTHONPATH']])
+
       tb_path = util.find_in_path(search_path, 'tensorboard')                             # executable in PATH
       if not tb_path:
         tb_path = util.find_in_path(search_path, 'tensorboard/main.py')                   # TF 1.3+