Upgrade to WAI / Warp 2.0.0