minor change on context scanning