Corrected context bug