fix the big WAW bug