Fix another iOS 8 issue