diff --git a/Makefile b/Makefile
index 4f8e5f3..e50aafc 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ build: build/lib/naxalnet/__init__.py
 build/lib/naxalnet/__init__.py: naxalnet/__init__.py
 	$(PYTHON) setup.py build
 
-install: build
+install:
 	$(PYTHON) setup.py install --root="$(DESTDIR)" --optimize=1 --skip-build
 
 uninstall:
diff --git a/naxalnet/scripts.py b/naxalnet/scripts.py
index 27b5389..cd45db8 100644
--- a/naxalnet/scripts.py
+++ b/naxalnet/scripts.py
@@ -260,7 +260,7 @@ def main():
 
     try:
         setup_devices()
-        setup_mesh()
+        setup_mesh(gateway_mode=gateway_mode)
 
         # Start the daemon so that setup_devices() is called every
         # time a device is connected or removed.