fix for issue 1221. However, need to double check which it's the best way to...

fix for issue 1221. However, need to double check which it's the best way to handle special characters