fix bugs
fix bugs iphone + android