Fixed to be in line with changes made to DataHolder