Fixed the dart encoding problems.