fixed null reference