Similar fix for scaling (#1416).