Fix iCloud issue