CFY-596 fix flake