Fixes #44
Update according to Dart r21094