Convert #226517 to Flügger