Attempt at fixing issues with tablets and phones