Try to fix the iOS bug again