Fix bug reported by @antonioIrizar on missing context_id