fixed the null paths issue