1. Fixed a race condition during startup