Duplicate entry og_access:node

I started getting this after my latest D7 uodate:

PDOException: SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry og_access:node for key PRIMARY INSERT INTO {node_access} (nid, realm, gid, grant_view, grant_update, grant_delete) VALUES (:db_insert_placeholder_0, :db_insert_placeholder_1, :db_insert_placeholder_2, :db_insert_placeholder_3, :db_insert_placeholder_4, :db_insert_placeholder_5), (:db_insert_placeholder_6, :db_insert_placeholder_7, :db_insert_placeholder_8, :db_insert_placeholder_9, :db_insert_placeholder_10, :db_insert_placeholder_11); Array ( [:db_insert_placeholder_0] => 1553 [:db_insert_placeholder_1] => og_access:node [:db_insert_placeholder_2] => 1553 [:db_insert_placeholder_3] => 1 [:db_insert_placeholder_4] => 0 [:db_insert_placeholder_5] => 0 [:db_insert_placeholder_6] => 1553 [:db_insert_placeholder_7] => og_access:node [:db_insert_placeholder_8] => 1553 [:db_insert_placeholder_9] => 1 [:db_insert_placeholder_10] => 0 [:db_insert_placeholder_11] => 0 ) in node_access_write_grants() (line 3557 of D:\xampp\htdocs\php\extranet\modules\node\node.module).

Tracing & debugging it, I would modify og_access.module around lines 123 to be:

case OG_CONTENT_ACCESS_PRIVATE:
$tmpArray = og_get_entity_groups('node', $node);
$key = array_search($node->nid, $tmpArray['node']); // remove nid if had been added previously
if (false !== $key)
unset($tmpArray['node'][$key]);
$gids = array_merge_recursive($gids, $tmpArray);
break;

Otherwise $gids ends up having two identical elements, thus the DB insert duplicate. You guys are the OG gurus: opinion?

thx

Sebastien