Fixed context resolution