diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a4cb989..04624cb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### Unreleased
+- Fixed the shebang line in `bombsquad_server` file by using `-S` flag for `/usr/bin/env`.
+
 ### 1.5.22 (20139)
 - Button and key names now display correctly again on Android (and are cleaned up on other platforms too).
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 7a0a5ed2..226a1795 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -14,3 +14,6 @@
 ### Benefit-Zebra
 - Unofficial BombSquad Bug Finder
 - Code Cleanup
+
+### Ali Borhani
+- Bug fixes
diff --git a/tools/batools/pcommand.py b/tools/batools/pcommand.py
index 9a848be5..b9248d75 100644
--- a/tools/batools/pcommand.py
+++ b/tools/batools/pcommand.py
@@ -62,7 +62,7 @@ def stage_server_file() -> None:
             lines = infile.read().splitlines()
             if mode == 'release':
                 lines[0] = replace_one(lines[0], '#!/usr/bin/env python3.7',
-                                       '#!/usr/bin/env python3.7 -O')
+                                       '#!/usr/bin/env -S python3.7 -O')
         with open(outfilename, 'w') as outfile:
             outfile.write('\n'.join(lines) + '\n')
         subprocess.run(['chmod', '+x', outfilename], check=True)