Convert #612249 to Flügger