Scalar fix