added WAI fix