The fix is correct, but it significantly changes the behavior of the history
partitioning on some case studies.
Keep it for later, in order to fully understand the consequences.