fix again null