added infinite retry on startup