Fixed directory shadowing issue [again]