Convert #329982 to Flügger