Convert #228587 to Flügger