WM-4894 fix