try to fix Context retrieval