(#18) Fix for mobile