Fix context management