CFY-487 fix flake