Fix issue where arch_prefix was still used