Convert #228535 to Flügger