Fix in how data values are computed from context data