Convert #332858 to Flügger