diff --git a/lib/server/flop.js b/lib/server/flop.js
index bde76979..b0cebd96 100644
--- a/lib/server/flop.js
+++ b/lib/server/flop.js
@@ -41,16 +41,13 @@
             break;
         
         case 'time':
-            time.get(path, function(error, time) {
-                var timeStr;
-                
-                if (!error)
-                    timeStr = time.toString();
-                
-                callback(error, timeStr);
-            });
+            time.get(path, callback);
             break;
             
+        case 'time raw':
+            time.get(path, callback);
+            break;
+        
         default:
             commander.getDirContent(path, callback);
             break;
diff --git a/lib/server/ischanged.js b/lib/server/ischanged.js
index e2df0cec..2e2f2612 100644
--- a/lib/server/ischanged.js
+++ b/lib/server/ischanged.js
@@ -17,7 +17,7 @@
     exports.isFileChanged = function(name, callback) {
         var readTime = Times[name];
         
-        time.get(name, function(error, fileTime) {
+        time.get(name, 'raw', function(error, fileTime) {
             var json, timeChanged;
             
             if (error) {
diff --git a/lib/server/time.js b/lib/server/time.js
index 34ac2b78..0dc08699 100644
--- a/lib/server/time.js
+++ b/lib/server/time.js
@@ -12,11 +12,13 @@
     var fs          = require('fs'),
         Util        = require('../util');
     
-    object.get      = function(filename, options, callback) {
-        var noOptions = Util.isFunction(options);
+    object.get      = function(filename, option, callback) {
+        var isRaw = option === 'raw';
         
-        if (!callback && noOptions)
-            callback = options;
+        if (!callback)
+            callback = option;
+        
+        Util.checkArgs(arguments, ['filename', 'callback']);
         
         fs.stat(filename, function(error, stat) {
             var time, timeRet;
@@ -24,13 +26,13 @@
             if (!error) {
                 time = stat.mtime;
                 
-                if (options && options.str)
-                    timeRet = time;
-                else
+                if (isRaw)
                     timeRet = time.getTime();
+                else
+                    timeRet = time;
             }
             
-            Util.exec(callback, error, timeRet);
+            callback(error, timeRet);
         });
     };
     
diff --git a/lib/server/users.js b/lib/server/users.js
index 64511e0f..f0d5e912 100644
--- a/lib/server/users.js
+++ b/lib/server/users.js
@@ -21,7 +21,7 @@
     };
     
     function getTime(callback) {
-        time.get(FILE, function(error, time) {
+        time.get(FILE, 'raw', function(error, time) {
             if (error)
                 callback(error);
             else if (FileTime === time) {