fixed auto populate