Just trying to make the PR working for the Archived

Try to merge the one from Laurent