Convert #228977 to Flügger