Make compatible with Dart-SDK 0.3.1.1_r17328