C# patch Daniel Tang.