Fix cells parsing for C# runtime