Fix execution engine