Convert #389605 to Flügger