Fixed another crash when launching for first time