Convert #226538 to Flügger