Convert #120629 to Flügger