Convert #228047 to Flügger