diff --git a/Makefile b/Makefile
index 35d5d686a0692a4b1da4f3be8f0d61ba905d7efe..f075c63cd75de0870d561ec81073a15fe976d0e8 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,7 @@ lint: install-build-requirements
 
 generate: clean-proto install-build-requirements
 	find $(PROTO_FILES_DIR) -name '*.proto' -exec python3 -m grpc_tools.protoc -I${PROTO_FILES_DIR} --python_out=$(OUTPUT_FILES_DIR) --grpc_python_out=$(OUTPUT_FILES_DIR) {} +
+	python fix_imports.py
 
 dist: clean generate
 	python setup.py sdist
@@ -62,4 +63,3 @@ release: dist
 
 install: clean generate install-requirements
 	python setup.py install
-	python fix_imports.py