Fixed context listener