Another fix attempt for iOS 6