#110 n #112 fix for mobile