BalajiN | Fixing problem with context loading