Hoeneß and Undav fit again