7.0 fix flakes8