_node_query_node_access_alter does not work with OG

With Drupal 7.39, I got:

Fatal error: Call to a member function conditions() on null in .../docroot/modules/node/node.module on line 3459

It looks like og_query_og_membership_alter() removes the field_data_og_group_ref table in the query and replaces it with og_membership. However it does not modify 'base_table' (which was added in field_sql_storage_field_storage_query() line 591):

      $select_query->addMetaData('base_table', $tablename);
      $select_query->fields($table_alias, array('entity_type', 'entity_id', 'revision_id', 'bundle'));

Later in _node_query_node_access_alter() since line 3415, it looks for the $base_table to make a subquery, which fails.

I don't know how to fix it properly because og_membership is the real table use to store data.