fixing WSAS-1782