FIXED: Strings were being escaped in the wrong place