More mobile compatibility improvement.