Fix context to be extended