FIX: Fix build from archive-commons change