diff --git a/lodash.js b/lodash.js
index d8c999d9d..6faddc626 100644
--- a/lodash.js
+++ b/lodash.js
@@ -4687,7 +4687,7 @@
      */
     function range(start, end, step) {
       start = +start || 0;
-      step = +step || 1;
+      step = isNumber(step) ? step : 1;
 
       if (end == null) {
         end = start;
@@ -4696,7 +4696,7 @@
       // use `Array(length)` so engines, like Chakra and V8, avoid slower modes
       // http://youtu.be/XAqIpGU8ZZk#t=17m25s
       var index = -1,
-          length = nativeMax(0, ceil((end - start) / step)),
+          length = nativeMax(0, ceil((end - start) / (step || 1))),
           result = Array(length);
 
       while (++index < length) {