* corrected possible null