#1368 fixed escapings