Convert #228685 to Flügger