updated to newer dart_flex