fixing issue - WSAS-1862
Merge pull request #44 from Nipuni/WSAS-1862

fixing issue - WSAS-1862