Convert #180336 to Flügger