Convert #226845 to Flügger