diff --git a/src/cli/command_parser.rb b/src/cli/command_parser.rb
index d9bc504ef6..748f302d6d 100644
--- a/src/cli/command_parser.rb
+++ b/src/cli/command_parser.rb
@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'optparse'
+require 'optparse/time'
 require 'pp'
 
 class String
@@ -28,6 +29,17 @@ class String
     end
 end
 
+if RUBY_VERSION > '1.8.7'
+    OptionParser.accept(Time) do |s,|
+        begin
+            (Time.strptime(s, "%m/%d/%Y %H:%M:%S")) if s
+        rescue
+            raise OptionParser::InvalidArgument, s
+        end
+    end
+end
+
+
 module CommandParser
     OPTIONS = [
         VERBOSE={
diff --git a/src/cli/one_helper/oneacct_helper.rb b/src/cli/one_helper/oneacct_helper.rb
index 55187c696d..3b6b4d9c55 100644
--- a/src/cli/one_helper/oneacct_helper.rb
+++ b/src/cli/one_helper/oneacct_helper.rb
@@ -15,7 +15,6 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
-require 'optparse/time'
 
 class AcctHelper < OpenNebulaHelper::OneHelper
     START_TIME = {
diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index 5dd840c45b..d0ada42864 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -15,7 +15,6 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
-require 'optparse/time'
 
 class OneVMHelper < OpenNebulaHelper::OneHelper
     MULTIPLE={