temp fixed null crash