fix for wai>=2