Convert #228645 to Flügger