Fix for WSAS-1741
Merge pull request #1 from kasunbg/master

Fix for WSAS-1741