Fix for mobile feature