Fixes issue voldemort/voldemort#234