context call & session load fix