fix broken contexts