fixed app context and services