Fixed removing unnecessary escape characters