Fix for Objective-C++