bug fix mobile final