Resolved a issue with code escaping