fixed escaped characters issue