Should have fixed context creation issues