diff --git a/composer.json b/composer.json
index 15d5328..bea7da7 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
   ],
   "type": "library",
   "homepage": "http://github.com/voku/php-hooks/",
-  "license": "GNU General Public License v3.0 only",
+  "license": "GPL-3.0",
   "authors": [
     {
       "name": "Ohad Raz",
diff --git a/src/voku/helper/Hooks.php b/src/voku/helper/Hooks.php
index 8f00214..929b8a9 100644
--- a/src/voku/helper/Hooks.php
+++ b/src/voku/helper/Hooks.php
@@ -1025,7 +1025,7 @@ public function shortcode_parse_atts($text)
             $atts[strtolower($m[3])] = stripcslashes($m[4]);
           } elseif (!empty($m[5])) {
             $atts[strtolower($m[5])] = stripcslashes($m[6]);
-          } elseif (isset($m[7]) and strlen($m[7])) {
+          } elseif (isset($m[7]) && strlen($m[7])) {
             $atts[] = stripcslashes($m[7]);
           } elseif (isset($m[8])) {
             $atts[] = stripcslashes($m[8]);