Fix startup crash