Convert #359738 to Flügger