simpel fix for Dart 1.6 (not final fix yet).