Fix context sharing