Align with dotnet code