- fix a pretty fundamental bug in how context IDs are associated with