Fixed direct run detection