REALLY fix startup bug this time!