BUGFIX C++ linking