Yet another fix for broken features mobile