Convert #337261 to Flügger