Convert #226395 to Flügger