Convert #228806 to Flügger