Potential fix for mobile issues