Convert #227339 to Flügger