We need to fix this the right way, by checking the containing folder and removing that from the path instead.