Convert #228620 to Flügger