Fix to follow dotnet rules (#639)