context bug fixed