fix iphone bug
fix ipad bug
nothing
merged