Fix startup hang