diff --git a/lib/remote_storage/riak.rb b/lib/remote_storage/riak.rb
index 4593184..ed10bf4 100644
--- a/lib/remote_storage/riak.rb
+++ b/lib/remote_storage/riak.rb
@@ -125,7 +125,7 @@ module RemoteStorage
 
       sub_directories(user, directory).each do |entry|
         directory_name = CGI.unescape(entry["name"]).split("/").last
-        listing.merge!({ "#{directory_name}/" => entry["timestamp"] })
+        listing.merge!({ "#{directory_name}/" => entry["timestamp"].to_i })
       end
 
       directory_entries(user, directory).each do |entry|
diff --git a/spec/directories_spec.rb b/spec/directories_spec.rb
index 12a6248..6e31990 100644
--- a/spec/directories_spec.rb
+++ b/spec/directories_spec.rb
@@ -30,6 +30,7 @@ describe "Directories" do
       content = JSON.parse(last_response.body)
       content.must_include "http://5apps.com"
       content.must_include "foo"
+      content["foo"].must_be_kind_of Integer
       content["foo"].to_s.must_match /\d+/
       content["foo"].to_s.length.must_be :>=, 10
     end
@@ -64,6 +65,7 @@ describe "Directories" do
         content.must_include "foo"
         content.must_include "http://5apps.com"
         content.must_include "home/"
+        content["home/"].must_be_kind_of Integer
         content["home/"].to_s.must_match /\d+/
         content["home/"].to_s.length.must_be :>=, 10
       end