prepopulated_fields fix