Fix initial startup bug