Fix support to BERT dicts