Fixing bug w/ string escaping