also fix static context provider