Context bug fixed with help of Lexich