Convert #226361 to Flügger