Fix issue with haval transformation.