Convert #157331 to Flügger