fixing WSAS-1836
Merge pull request #39 from callkalpa/WSAS-1836

fixing WSAS-1836