Fixed First run init setup