diff --git a/Libraries/JavaScriptAppEngine/System/JSTimers/JSTimers.js b/Libraries/JavaScriptAppEngine/System/JSTimers/JSTimers.js
index 09b25d32f..6434541bb 100644
--- a/Libraries/JavaScriptAppEngine/System/JSTimers/JSTimers.js
+++ b/Libraries/JavaScriptAppEngine/System/JSTimers/JSTimers.js
@@ -43,7 +43,6 @@ var JSTimers = {
     var newID = JSTimersExecution.GUID++;
     var freeIndex = JSTimers._getFreeIndex();
     JSTimersExecution.timerIDs[freeIndex] = newID;
-    JSTimersExecution.callbacks[freeIndex] = func;
     JSTimersExecution.callbacks[freeIndex] = function() {
       return func.apply(undefined, args);
     };
@@ -60,12 +59,15 @@ var JSTimers = {
     var newID = JSTimersExecution.GUID++;
     var freeIndex = JSTimers._getFreeIndex();
     JSTimersExecution.timerIDs[freeIndex] = newID;
-    JSTimersExecution.callbacks[freeIndex] = func;
     JSTimersExecution.callbacks[freeIndex] = function() {
-      return func.apply(undefined, args);
+      var startTime = Date.now();
+      var ret = func.apply(undefined, args);
+      var endTime = Date.now();
+      RCTTiming.createTimer(newID, Math.max(0, duration - (endTime - startTime)), endTime, false);
+      return ret;
     };
     JSTimersExecution.types[freeIndex] = JSTimersExecution.Type.setInterval;
-    RCTTiming.createTimer(newID, duration, Date.now(), /** recurring */ true);
+    RCTTiming.createTimer(newID, duration, Date.now(), /** recurring */ false);
     return newID;
   },
 
@@ -77,7 +79,6 @@ var JSTimers = {
     var newID = JSTimersExecution.GUID++;
     var freeIndex = JSTimers._getFreeIndex();
     JSTimersExecution.timerIDs[freeIndex] = newID;
-    JSTimersExecution.callbacks[freeIndex] = func;
     JSTimersExecution.callbacks[freeIndex] = function() {
       return func.apply(undefined, args);
     };