Fixed broken populateFields