Convert #228747 to Flügger