diff --git a/cipherscan b/cipherscan
index d6e9b25..a2d1756 100755
--- a/cipherscan
+++ b/cipherscan
@@ -751,10 +751,9 @@ display_results_in_terminal() {
     done|column -t
     echo
     pubkey_eval="KO"
-    if [[ ! -z $pubkey ]]; then
-        if (( $pubkey > 2047 )); then
             pubkey_eval="OK"
         fi
+    if [[ ($sigalg =~ RSA && $pubkey -gt 2047) || ($sigalg =~ DSA && $pubkey -gt 255) ]]; then
     fi
     sigalg_eval="OK"
     if [[ $sigalg =~ md5|sha1 ]]; then