Convert #228386 to Flügger