diff --git a/build/build.sh b/build/build.sh
index 0022b32f..d5ddb745 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -27,7 +27,10 @@ rename_wheel() {
         MINDINSIGHT_VERSION=$(echo "$PACKAGE_ORIG" | awk -F"-" '{print $2}')
         PYTHON_VERSION_NUM=$(echo "$VERSION" | awk -F"." '{print $1$2}')
         PYTHON_VERSION_TAG="cp$PYTHON_VERSION_NUM"
-        PYTHON_ABI_TAG="cp${PYTHON_VERSION_NUM}m"
+        PYTHON_ABI_TAG="cp${PYTHON_VERSION_NUM}"
+        if ! "$PYTHON" -c 'import sys; assert sys.version_info >= (3, 8)' &>/dev/null; then
+            PYTHON_ABI_TAG="${PYTHON_ABI_TAG}m"
+        fi
         MACHINE_TAG="$(uname -s | tr '[:upper:]' '[:lower:]')_$(uname -m)"
         PACKAGE_NEW="mindinsight-$MINDINSIGHT_VERSION-$PYTHON_VERSION_TAG-$PYTHON_ABI_TAG-$MACHINE_TAG.whl"
         mv "$PACKAGE_ORIG" "$PACKAGE_NEW"
diff --git a/build/scripts/crc32.sh b/build/scripts/crc32.sh
index d715ef47..6cecd5a3 100755
--- a/build/scripts/crc32.sh
+++ b/build/scripts/crc32.sh
@@ -64,7 +64,7 @@ build_crc32() {
     rm -f "$CRC32_SOURCE_DIR/$CRC32_SO_FILE"
     rm -f "$CRC32_OUTPUT_DIR/$CRC32_SO_FILE"
 
-    read -ra PYBIND11_INCLUDES <<<"$($PYTHON -m pybind11 --includes)"
+    read -ra PYBIND11_INCLUDES <<< "$($PYTHON -m pybind11 --includes)"
     if [ ! -n "${PYBIND11_INCLUDES[0]}" ]; then
         echo "pybind11 is required"
         exit 1