Fix data providers not finalized