CFY-637 fix flake