Convert #228428 to Flügger