fix the issue 1052 in Whau3