fix for CSHARP_80 and CSHARP_82