Refs #3925 - Fix wrong files and bizarre logics