Re #6366 improve condition for running