After testing, fixed csharp and c++