Add extra checking for Bypass second inputs.