hotfix on archive as well