Convert #226738 to Flügger