Convert #226537 to Flügger