Convert #228395 to Flügger