Fix for fields with different column name