some changes for fix mobile bugs