Convert #226838 to Flügger