might have fixed null ref