Fix archive once and for all :)