Fix the context