- Fix startup crash
