-- Fixed application context loading issue