Convert #612405 to Flügger