Fix for new Xcode update