Convert #228429 to Flügger