Fix for mobile
changes v1