MOBILE-1141 fixed