Fixed context mishap