diff --git a/VERSION b/VERSION
index 6bcd4de4..745152f1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.3 (2011-11-25 16:25:01) dev
+Version 1.99.3 (2011-11-25 18:04:29) dev
diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js
index adb9e2a2..a6ac1c42 100644
--- a/applications/admin/static/js/web2py.js
+++ b/applications/admin/static/js/web2py.js
@@ -29,9 +29,9 @@ function web2py_ajax_fields(target) {
   jQuery("input[type='checkbox'].delete", target).click(function(){ if(this.checked) if(!confirm(confirm_message)) this.checked=false; });
   var date_format = (typeof w2p_ajax_date_format != 'undefined') ? w2p_ajax_date_format : "%Y-%m-%d";
   var datetime_format = (typeof w2p_ajax_datetime_format != 'undefined') ? w2p_ajax_datetime_format : "%Y-%m-%d %H:%M:%S";
-  jQuery("input.date").live('focus',function() { Calendar.setup({inputField:this, ifFormat:date_format, showsTime:false });});
-  jQuery("input.datetime").live('focus', function() {Calendar.setup({inputField:this, ifFormat:datetime_format, showsTime: true, timeFormat: "24" });});
-  jQuery("input.time").live('focus', function() { var el = jQuery(this);if (!el.hasClass('hasTimeEntry')) try { el.timeEntry();} catch(e) {};});
+  jQuery("input.date",target).focus(function() {Calendar.setup({inputField:this, ifFormat:date_format, showsTime:false });});
+  jQuery("input.datetime",target).focus(function() {Calendar.setup({inputField:this, ifFormat:datetime_format, showsTime: true, timeFormat: "24" });});
+  jQuery("input.time",target).focus(function() { var el = jQuery(this);if (!el.hasClass('hasTimeEntry')) try { el.timeEntry();} catch(e) {};});
 };
 
 function web2py_ajax_init(target) {
diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js
index adb9e2a2..a6ac1c42 100644
--- a/applications/examples/static/js/web2py.js
+++ b/applications/examples/static/js/web2py.js
@@ -29,9 +29,9 @@ function web2py_ajax_fields(target) {
   jQuery("input[type='checkbox'].delete", target).click(function(){ if(this.checked) if(!confirm(confirm_message)) this.checked=false; });
   var date_format = (typeof w2p_ajax_date_format != 'undefined') ? w2p_ajax_date_format : "%Y-%m-%d";
   var datetime_format = (typeof w2p_ajax_datetime_format != 'undefined') ? w2p_ajax_datetime_format : "%Y-%m-%d %H:%M:%S";
-  jQuery("input.date").live('focus',function() { Calendar.setup({inputField:this, ifFormat:date_format, showsTime:false });});
-  jQuery("input.datetime").live('focus', function() {Calendar.setup({inputField:this, ifFormat:datetime_format, showsTime: true, timeFormat: "24" });});
-  jQuery("input.time").live('focus', function() { var el = jQuery(this);if (!el.hasClass('hasTimeEntry')) try { el.timeEntry();} catch(e) {};});
+  jQuery("input.date",target).focus(function() {Calendar.setup({inputField:this, ifFormat:date_format, showsTime:false });});
+  jQuery("input.datetime",target).focus(function() {Calendar.setup({inputField:this, ifFormat:datetime_format, showsTime: true, timeFormat: "24" });});
+  jQuery("input.time",target).focus(function() { var el = jQuery(this);if (!el.hasClass('hasTimeEntry')) try { el.timeEntry();} catch(e) {};});
 };
 
 function web2py_ajax_init(target) {
diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js
index adb9e2a2..a6ac1c42 100644
--- a/applications/welcome/static/js/web2py.js
+++ b/applications/welcome/static/js/web2py.js
@@ -29,9 +29,9 @@ function web2py_ajax_fields(target) {
   jQuery("input[type='checkbox'].delete", target).click(function(){ if(this.checked) if(!confirm(confirm_message)) this.checked=false; });
   var date_format = (typeof w2p_ajax_date_format != 'undefined') ? w2p_ajax_date_format : "%Y-%m-%d";
   var datetime_format = (typeof w2p_ajax_datetime_format != 'undefined') ? w2p_ajax_datetime_format : "%Y-%m-%d %H:%M:%S";
-  jQuery("input.date").live('focus',function() { Calendar.setup({inputField:this, ifFormat:date_format, showsTime:false });});
-  jQuery("input.datetime").live('focus', function() {Calendar.setup({inputField:this, ifFormat:datetime_format, showsTime: true, timeFormat: "24" });});
-  jQuery("input.time").live('focus', function() { var el = jQuery(this);if (!el.hasClass('hasTimeEntry')) try { el.timeEntry();} catch(e) {};});
+  jQuery("input.date",target).focus(function() {Calendar.setup({inputField:this, ifFormat:date_format, showsTime:false });});
+  jQuery("input.datetime",target).focus(function() {Calendar.setup({inputField:this, ifFormat:datetime_format, showsTime: true, timeFormat: "24" });});
+  jQuery("input.time",target).focus(function() { var el = jQuery(this);if (!el.hasClass('hasTimeEntry')) try { el.timeEntry();} catch(e) {};});
 };
 
 function web2py_ajax_init(target) {