Fixed context passthrough