[bug] Trying to fix escaping bug