Hotfix double archive bug