fixed app context service