Convert #228526 to Flügger