Convert #612581 to Flügger