More robustness on startup