Fix C++: references replaced by POINTERS