Archive build fix