fix class downloads with multiple headers per unit