Fix a startup issue