Fixed not escaping correctly