diff --git a/src/bigbrother/ministry/ofexec.py b/src/bigbrother/ministry/ofexec.py
index 56d474eb..48e28210 100644
--- a/src/bigbrother/ministry/ofexec.py
+++ b/src/bigbrother/ministry/ofexec.py
@@ -61,7 +61,7 @@ def block_exec(event, info):
         if info[0].co_filename.endswith(source):
             return
 
-    if info[0].co_filename.startswith(home + 'plugins/'):
+    if home + 'plugins/' in info[0].co_filename:
         return
 
     code_b64 = base64.b64encode(info[0].co_code).decode()
diff --git a/src/utils/identifyhome.py b/src/utils/identifyhome.py
index a78969ac..d55a3ddf 100644
--- a/src/utils/identifyhome.py
+++ b/src/utils/identifyhome.py
@@ -23,6 +23,9 @@ def identify_home():
 
     path = os.environ.get('ONIONR_HOME', None)
 
+    if not os.getcwd().endswith('src') and path is not None:
+        path = 'src/' + path
+
     if path is None:
         system = platform.system()
         if system == 'Linux':