Convert #228397 to Flügger