Fix for WSAS-1751