Convert #337905 to Flügger