Fix for Dart SDK change