Fix for contents with quotes