Fix the context issues