Convert #180338 to Flügger