Fix for new Dart SDK API