Convert #397477 to Flügger