Convert #337586 to Flügger