Fix for WSAS-1716