Fix escaping of variables