Convert #226879 to Flügger