Fix for CSV Core