MOBILE-201 Trying to fix the problem, new attempt