Fixed a missed guid -> context_id change