Better fix for mobile