Fixed context bug