fix autopopulate