Fix for pre-ios8