fixing issue - WSAS-1862