(c) Fix issue with transformation applied too late