Fix execution bug