Hotfix: Use proper escaping function