vdi: change goto to loop