diff --git a/setup.py b/setup.py
index 0d8491c5..a8e0b2b2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+import os
 import setuptools
 
 with open("README.md", "r", encoding="utf-8") as fh:
@@ -5,6 +6,11 @@
 
 version = "{{VERSION_PLACEHOLDER}}"
 
+# Fallback for direct Git installation (where 'sed' replacement is not performed)
+if version.startswith("{{"):
+    # Default to 0.0.1.dev0 to ensure 'pip install' doesn't crash
+    version = os.environ.get("PEPIT_VERSION", "0.0.1.dev0")
+
 setuptools.setup(
     name="PEPit",
     version=version,
@@ -30,6 +36,6 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
-    packages=[element for element in setuptools.find_packages() if element[:5] == 'PEPit'],
+    packages=[pkg for pkg in setuptools.find_packages() if pkg == "PEPit" or pkg.startswith("PEPit.")],
     python_requires=">=3.9",
 )