t673 Fix 508 Issues that generated by WAVE