Fixing double-escape bugs