If you have the AEM CAI, you can get the Bypass valve. Only problem is it tends to make you lose HP. I heard somewhere that the Comptech Ice box is pretty good about hydrolocking. Don't know for fact but its worth investigating.