flake issue fixing