fixing Wsas-1866
Merge pull request #105 from Nipuni/Wsas-1866

fixing Wsas-1866