Harden dependency logic