Fixed for renamed DwC fiuelds