Convert #228794 to Flügger