updated to work with dart 1.5.1