Not sure at all about this one, seemed necessary to me,
but I don't get the full logic in there.

To be refined.