fix for SS-416
Merge pull request #76 from bhathiya/master

fix for SS-416