Reduce race problems during start-up