Add retry for race conditions