fixing ADV move bugs