Removed context sharing (behaviour inconsistency is back)