*8309* Fix double escaping