diff --git a/build_and_test.sh b/build_and_test.sh
index 2884813..e683b0b 100755
--- a/build_and_test.sh
+++ b/build_and_test.sh
@@ -15,10 +15,11 @@ echo
 
 # 2. Build the C++ client
 echo "[2/3] Building C++ client..."
-cd "$(dirname "$0")"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+cd "$SCRIPT_DIR"
 mkdir -p build
 cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release
+cmake "$SCRIPT_DIR" -DCMAKE_BUILD_TYPE=Release
 make -j$(nproc)
 echo "✓ C++ client built successfully"
 echo