Convert #612231 to Flügger