Fixed code-escape issue