CBN re-execution fix