Adapt to dart 53f060126207654b7d7ea7918782fa00a7f1f529