Fix for WSAS-1702