WM3 fixed