fix the context