fixed the null