Convert #226291 to Flügger