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