Fix execution context