Fix transformations once and for all