Fixes #5778 - make sure that we always execute the planned tasks