diff --git a/get_all_keys.sh b/get_all_keys.sh
index 992642a..80e3edd 100755
--- a/get_all_keys.sh
+++ b/get_all_keys.sh
@@ -299,7 +299,6 @@ if $EASYRSA_LAYOUT_NEW ; then
       _serial="$(basename "$_cert")"
       _serial="${_serial%.*}"
 
-
       if [[ "$os_dist" = "debian" ]] && [[ $os_version -ge 13 ]] ; then
          #_cn="$(openssl x509  -noout -text -in $_cert | grep Subject: | grep -oP 'CN=\K[^,]+')"
          _cn="$(openssl x509  -noout -text -in $_cert | grep Subject: | sed -n 's/.*CN=\([^,]*\).*/\1/p')"
@@ -322,7 +321,13 @@ else
       _serial="$(basename "$_cert")"
       _serial="${_serial%.*}"
 
-      _cn="$(openssl x509  -noout -text -in $_cert | grep Subject: | grep -oE "CN\s*=\s*[^,]+" | awk '{print$3}')"
+      if [[ "$os_dist" = "debian" ]] && [[ $os_version -ge 13 ]] ; then
+         #_cn="$(openssl x509  -noout -text -in $_cert | grep Subject: | grep -oP 'CN=\K[^,]+')"
+         _cn="$(openssl x509  -noout -text -in $_cert | grep Subject: | sed -n 's/.*CN=\([^,]*\).*/\1/p')"
+      else
+         _cn="$(openssl x509  -noout -text -in $_cert | grep Subject: | grep -oE "CN\s*=\s*[^,]+" | awk '{print$3}')"
+      fi
+
       all_arr+=("${_serial}:$(trim $_cn)")
       if ! containsElement "${_serial}:$(trim $_cn)" "${revoked_arr[@]}" ; then
          active_arr+=("${_serial}:$(trim $_cn)")