Fix bug which propogated data points to parent contexts