Fixed flake issue