Convert #372980 to Flügger