Potential fix for MOBILE-1445
Fix review issue
Merge pull request #82 from ldjagger/master

Bug fixing.