Fixes issue with using Hbasestorage in cluster mode