CFY-606 fix flake