Fix issue with encoding quotes