Convert #397367 to Flügger