fix the null problen