Fixed problem populating several fields