Fix a run on system start up bug