diff --git a/src/babel/util.js b/src/babel/util.js
index 373bfbb75c..f0bbc4286c 100644
--- a/src/babel/util.js
+++ b/src/babel/util.js
@@ -59,8 +59,10 @@ export function list(val: string): Array<string> {
     return [];
   } else if (Array.isArray(val)) {
     return val;
-  } else {
+  } else if (typeof val === "string") {
     return val.split(",");
+  } else {
+    return [val];
   }
 }
 
diff --git a/test/core/util.js b/test/core/util.js
index a26cc7f058..13df528b74 100644
--- a/test/core/util.js
+++ b/test/core/util.js
@@ -58,6 +58,10 @@ suite("util", function () {
     assert.deepEqual(util.list("foo"), ["foo"]);
     assert.deepEqual(util.list("foo,bar"), ["foo", "bar"]);
     assert.deepEqual(util.list(["foo", "bar"]), ["foo", "bar"]);
+    assert.deepEqual(util.list(/foo/), [/foo/]);
+
+    var date = new Date;
+    assert.deepEqual(util.list(date), [date]);
   });
 
   test("arrayify", function () {