More mobile fix