Trying to fix quotes escaping