Fix for dart 1.1