Fix execution of immediately following commands