Added potential fix for setData/populateValues