Fixed bug with archive