diff --git a/diagnose b/diagnose
index 3001a62a2..55c97704f 100755
--- a/diagnose
+++ b/diagnose
@@ -39,8 +39,8 @@ _exec() {
 _check_distro_id() {
   OS_RELEASE_FILE=/etc/os-release
   if [[ -f "$OS_RELEASE_FILE" ]]; then
-    OS_DISTRO_ID=$(awk -F'=' '/^ID=/ { gsub("\"","",$2); print tolower($2) }' ${OS_RELEASE_FILE} 2> /dev/null)
-    OS_DISTRO_ID_LIKE=$(awk -F'=' '/^ID_LIKE=/ { gsub("\"","",$2); print tolower($2) }' ${OS_RELEASE_FILE} 2> /dev/null)
+    OS_DISTRO_ID=$(awk -F'=' '/^ID=/ { gsub(/["\x27]/,"",$2); print tolower($2) }' ${OS_RELEASE_FILE} 2> /dev/null)
+    OS_DISTRO_ID_LIKE=$(awk -F'=' '/^ID_LIKE=/ { gsub(/["\x27]/,"",$2); print tolower($2) }' ${OS_RELEASE_FILE} 2> /dev/null)
     echo "distro ID: $OS_DISTRO_ID"
     echo "distro ID_LIKE: $OS_DISTRO_ID_LIKE"
   else
diff --git a/sdata/lib/dist-determine.sh b/sdata/lib/dist-determine.sh
index 78f548ac1..e45d46bc3 100644
--- a/sdata/lib/dist-determine.sh
+++ b/sdata/lib/dist-determine.sh
@@ -78,8 +78,8 @@ elif test -f /etc/os-release; then
 else
   printf "${STY_RED}/etc/os-release does not exist, aborting...${STY_RST}\n" ; exit 1
 fi
-export OS_DISTRO_ID=$(awk -F'=' '/^ID=/ { gsub("\"","",$2); print tolower($2) }' ${OS_RELEASE_FILE} 2> /dev/null)
-export OS_DISTRO_ID_LIKE=$(awk -F'=' '/^ID_LIKE=/ { gsub("\"","",$2); print tolower($2) }' ${OS_RELEASE_FILE} 2> /dev/null)
+export OS_DISTRO_ID=$(awk -F'=' '/^ID=/ { gsub(/["\x27]/,"",$2); print tolower($2) }' ${OS_RELEASE_FILE} 2> /dev/null)
+export OS_DISTRO_ID_LIKE=$(awk -F'=' '/^ID_LIKE=/ { gsub(/["\x27]/,"",$2); print tolower($2) }' ${OS_RELEASE_FILE} 2> /dev/null)
 
 
 ####################