Convert #228588 to Flügger