fixed null pointers on a clean install