Convert #226937 to Flügger