Fix CREATE_AVD.......................