Upgrade to WAI 3.x