refs #4532 easier fix with less logic