Fix unpaired validation
Update check for whether step needs to run or not