Fix for archive