Make compatible with Dart SDK version 0.5.13.1_r23552