Convert #337645 to Flügger