Kscaled patch from Ute.