First run fix