Fixing RunTargetOrDefault