diff --git a/jquery.joyride-2.1.js b/jquery.joyride-2.1.js
index 72fb38d..3b887f4 100755
--- a/jquery.joyride-2.1.js
+++ b/jquery.joyride-2.1.js
@@ -158,7 +158,7 @@
 
       // call this method when you want to resume the tour
       resume : function () {
-        methods.set_li();
+        settings.paused = false;
         methods.show();
       },
 
@@ -240,16 +240,14 @@
         var opts = {}, ii, opts_arr = [], opts_len = 0, p,
             $timer = null;
 
-        // are we paused?
-        if (settings.$li === undefined || ($.inArray(settings.$li.index(), settings.pauseAfter) === -1)) {
 
-          // don't go to the next li if the tour was paused
           if (settings.paused) {
-            settings.paused = false;
-          } else {
-            methods.set_li(init);
+            return;
           }
 
+          methods.set_li(init);
+          
+
           settings.attempts = 0;
 
           if (settings.$li.length && settings.$target.length > 0) {
@@ -343,11 +341,6 @@
             methods.end();
 
           }
-        } else {
-
-          settings.paused = true;
-
-        }
 
       },
 
@@ -377,6 +370,11 @@
         }
         settings.$current_tip.hide();
         settings.postStepCallback(settings.$li.index(), settings.$current_tip);
+
+        // do we need to pause?
+        if (!(settings.$li === undefined || ($.inArray(settings.$li.index(), settings.pauseAfter) === -1))) {
+          settings.paused = true;
+        }
       },
 
       set_li : function (init) {