Convert #722381 to Flügger