bug fixed for mobile
merge