Switched to c++_static