fixing contexts