Imported mobile data fix from mako