Bug fix for mobile app