Convert #226682 to Flügger