- static context bug fix