WM-4890 fix to work in non debug mode