Fix trie import

Merge to master