Fixed crash on clean install
Nightlt build v22