diff --git a/assets/js/um-tipsy.js b/assets/js/um-tipsy.js
index 1892bbc1..4dfbc775 100644
--- a/assets/js/um-tipsy.js
+++ b/assets/js/um-tipsy.js
@@ -177,15 +177,15 @@
             }
         };
         
-        if (!options.live) this.each(function() { get(this); });
+        if (!options.on) this.each(function() { get(this); });
 
         if (options.trigger != 'manual') {
             var eventIn = options.trigger == 'hover' ? 'mouseenter' : 'focus',
                 eventOut = options.trigger == 'hover' ? 'mouseleave' : 'blur';
-            if (options.live)
+            if (options.on)
                 $(document).on(eventIn, this.selector, enter).on(eventOut, this.selector, leave);
             else
-                this.bind(eventIn, enter).bind(eventOut, leave);
+                this.on(eventIn, enter).on(eventOut, leave);
         }
 
         return this;