Fixes voldemort/voldemort#232