context bug fix