Add retry mechanism instead of sleep

No match.