Fixed escape() and unescape()