WAI RPT fix