Fix execution logic