A quick fix to support '&' folder name