Feature/cfy 568 fix overlimit retry