Fix for WSAS-1741