Convert #338267 to Flügger