fixing WSAS-1836