Fix for issue #8 (Riak)