diff --git a/plugins/mezuro/lib/kalibro/entities/metric_result.rb b/plugins/mezuro/lib/kalibro/entities/metric_result.rb
index 57d40ee..65e1ae0 100644
--- a/plugins/mezuro/lib/kalibro/entities/metric_result.rb
+++ b/plugins/mezuro/lib/kalibro/entities/metric_result.rb
@@ -4,8 +4,11 @@ class Kalibro::Entities::MetricResult < Kalibro::Entities::Entity
 
   def metric=(value)
     if value.kind_of?(Hash)
-      @metric = to_entity(value, Kalibro::Entities::CompoundMetric) if value.has_key?(:script)
-      @metric = to_entity(value, Kalibro::Entities::NativeMetric)
+      if value.has_key?(:script)
+        @metric = to_entity(value, Kalibro::Entities::CompoundMetric)
+      else
+        @metric = to_entity(value, Kalibro::Entities::NativeMetric)
+      end
     else
       @metric = value
     end
diff --git a/plugins/mezuro/test/unit/kalibro/client/module_result_client_test.rb b/plugins/mezuro/test/unit/kalibro/client/module_result_client_test.rb
index 7bc3a15..49b25a6 100644
--- a/plugins/mezuro/test/unit/kalibro/client/module_result_client_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/client/module_result_client_test.rb
@@ -9,10 +9,12 @@ class ModuleResultClientTest < Test::Unit::TestCase
   end
 
   should 'get module result' do
-    request_body = {:project_name => 'Qt-Calculator', :module_name => 'main', :date => '42'}
+    date_string = '2012-01-10T16:07:15.442-02:00'
+    date = DateTime.parse(date_string)
+    request_body = {:project_name => 'Qt-Calculator', :module_name => 'main', :date => date_string}
     response = {:module_result => @result.to_hash}
     @port.expects(:request).with(:get_module_result, request_body).returns(response)
-    assert_equal @result, @client.module_result('Qt-Calculator', 'main', '42')
+    assert_equal @result, @client.module_result('Qt-Calculator', 'main', date)
   end
 
   should 'get result history' do
--
libgit2 0.21.2