Fix execution order