Fixed transforms to be more accurate