Dart bug fix