Make bypass function more innocuous