Fix context binding