Fix to work with scalding.