Re-enable escaping and do it RIGHT.