CFY-225 fix flake