(iOS) Fix up iOS solution AGAIN