Added fix for paths with & characters