Yet another LINQ bugfix