fixed context loading