fix extra context bug #38