Original path null fix