Fixed issue with escaped characters