Fix context problem