MOBILE-1409 fix