diff --git a/Makefile b/Makefile
index 1f64995..f8f5e1f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,3 +11,9 @@ lint:
 
 gen:
 	bash ./scripts/generate-code.sh
+	$(MAKE) fix
+
+fix:
+	cargo fix --allow-dirty --allow-staged
+	cargo fmt
+
diff --git a/scripts/generate-code.sh b/scripts/generate-code.sh
index 4e60446..88a0048 100755
--- a/scripts/generate-code.sh
+++ b/scripts/generate-code.sh
@@ -22,6 +22,3 @@ done
 # shellcheck disable=SC2068
 cargo run --bin code-generator -- --out-dir="${SRC_DIR}/core/" ${DICT_FILES[@]}
 
-cargo fix --allow-dirty --allow-staged
-cargo fmt
-