Fixed propagation of data context.