Convert #228359 to Flügger