iOS 8 related fix