Incorrect SQL with class table inheritance and joins

I am getting incorrect SQL with class table inheritance and joins.

Here is my LINQ query:

events = events.Join(
  UnitOfWork.GeographicalAreaCities.Where(c => c.GeographicalAreaId == eventFilter.GeographicalAreaId.Value),
  e => e.Place.CityId, a => a.CityId,
  (e, a) => e);

And here is the generated SQL:

exec sp_executesql N'SELECT
  COUNT(*)
FROM
  [Object] [t0]
INNER JOIN
  [Object] [t2]
ON
  [t0].[PlaceId] = [t2].[Id]
INNER JOIN
  (SELECT
    [GeographicalAreaCity].[Id],
    [GeographicalAreaCity].[CityId],
    [GeographicalAreaCity].[GeographicalAreaId]
  FROM
    [GeographicalAreaCity]
  WHERE
    [GeographicalAreaCity].[GeographicalAreaId] = @p1
  ) t1
ON
  [t2].[CityId] = t1.CityId
LEFT OUTER JOIN
  [Event]
ON
  [t0].[Id] = [Event].[Id]
WHERE
  [t0].[ObjectTypeId] = @p0',N'@p0 nvarchar(36),@p1 uniqueidentifier',@p0=N'60B2ACC6-6E0C-43E3-8301-8459AF5BDCC8',@p1='9536F265-CD03-43C3-B4F4-CE938A0D1059'

And here is the error:

Msg 207, Level 16, State 1, Line 8
Invalid column name 'PlaceId'.
Msg 207, Level 16, State 1, Line 20
Invalid column name 'CityId'.

The problem is PlaceId and CityId exist on derived tables but the SQL is searching for them on the base [Object] table.

We have added in a fix for this and it will be available in tonights nightly build.

Jeremy