Better fix, that preserves needed C# keyword