Fix context creation being broken in some cases