diff --git a/core/misc/states.es6.js b/core/misc/states.es6.js
index daf531f..b3164ae 100644
--- a/core/misc/states.es6.js
+++ b/core/misc/states.es6.js
@@ -106,13 +106,13 @@
         return false;
       }
       // Convert all comparisons to strings for indexOf to work with integers
-      // comparing to strings
+      // comparing to strings.
       reference = reference.map(String);
       value = value.map(String);
       // We iterate through each value provided in the reference. If all of them
       // exist in value array, we return true. Otherwise return false.
-      for (var key in reference) {
-        if (reference.hasOwnProperty(key) && value.indexOf(reference[key]) === -1) {
+      for (var [key, referenceValue] of Object.entries(reference)) {
+        if (value.indexOf(reference[key]) === -1) {
           return false;
         }
       }
diff --git a/core/misc/states.js b/core/misc/states.js
index 0723167..73c45d3 100644
--- a/core/misc/states.js
+++ b/core/misc/states.js
@@ -4,6 +4,7 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
+var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
 
 (function ($, Drupal) {
   var states = Drupal.states = {
@@ -70,12 +71,38 @@
 
       reference = reference.map(String);
       value = value.map(String);
+      var _iteratorNormalCompletion = true;
+      var _didIteratorError = false;
+      var _iteratorError = undefined;
 
-      for (var key in reference) {
-        if (reference.hasOwnProperty(key) && value.indexOf(reference[key]) === -1) {
-          return false;
+      try {
+        for (var _iterator = Object.entries(reference)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var _ref = _step.value;
+
+          var _ref2 = _slicedToArray(_ref, 2);
+
+          var key = _ref2[0];
+          var referenceValue = _ref2[1];
+
+          if (value.indexOf(reference[key]) === -1) {
+            return false;
+          }
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
+          }
         }
       }
+
       return true;
     }),
     Number: function Number(reference, value) {